merge r25974
authorJo-Philipp Wich <[email protected]>
Wed, 9 Mar 2011 14:45:58 +0000 (14:45 +0000)
committerJo-Philipp Wich <[email protected]>
Wed, 9 Mar 2011 14:45:58 +0000 (14:45 +0000)
commitd2f88272813264274621cfde78630831eab784b3
tree50ec9a36ddcad7771f83a1fd3620aff090de8810
parent2fa6df51aaa8f6b6704744119d313057c073cc40
merge r25974

SVN-Revision: 25975
tools/Makefile
tools/xfce-macros/Makefile [new file with mode: 0644]